diff --git a/doc/Clusters_from_Scratch/en-US/Book_Info.xml b/doc/Clusters_from_Scratch/en-US/Book_Info.xml
index 22c0519e7e..9584259e7a 100644
--- a/doc/Clusters_from_Scratch/en-US/Book_Info.xml
+++ b/doc/Clusters_from_Scratch/en-US/Book_Info.xml
@@ -1,66 +1,66 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "Clusters_from_Scratch.ent">
 %BOOK_ENTITIES;
 ]>
 <bookinfo id="book-Clusters_from_Scratch-Clusters_from_Scratch" lang="en-US">
 	<title>Clusters from Scratch</title>
 	<subtitle>Creating Active/Passive and Active/Active Clusters on Fedora</subtitle>
 	<productname>Pacemaker</productname>
 	<productnumber>1.1</productnumber>
 	<edition>3</edition>
 	<pubsnumber>0</pubsnumber>
 	<abstract>
 		<para>
 			The purpose of this document is to provide a start-to-finish guide to building an example active/passive cluster with Pacemaker and show how it can be converted to an active/active one.
 		</para>
 		<para>
 			The example cluster will use: 
 			<orderedlist>
 				<listitem>
 					<para>
-						Fedora 12 as the host operating system
+						&DISTRO; &DISTRO_VERSION; as the host operating system
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						Corosync to provide messaging and membership services,
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						Pacemaker to perform resource management,
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						DRBD as a cost-effective alternative to shared storage,
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						GFS2 as the cluster filesystem (in active/active mode)
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						The crm shell for displaying the configuration and making changes
 					</para>
 				</listitem>
 			</orderedlist>
 		</para>
 		<para>
 			Given the graphical nature of the Fedora install process, a number of screenshots are included. However the guide is primarily composed of commands, the reasons for executing them and their expected outputs.
 		</para>
 	</abstract>
 	<corpauthor>
 		<inlinemediaobject>
 			<imageobject>
 				<imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
 			</imageobject>
 		</inlinemediaobject>
 	</corpauthor>
 	<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </bookinfo>
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a112f27312..003038785f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,133 +1,134 @@
 #
 # doc: Pacemaker code
 #
 # Copyright (C) 2008 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 helpdir		= $(datadir)/$(PACKAGE)
 
 ascii		= crm_cli.txt crm_fencing.txt
 help_DATA	= crm_cli.txt
 docbook		= Pacemaker_Explained Clusters_from_Scratch
 man_MANS	= cibadmin.8 crm_resource.8
 doc_DATA	= README.hb2openais $(ascii) $(generated_docs)
 
 publican_docs    =
 generated_docs	= 
 
 SVG := $(wildcard */en-US/images/pcmk-*.svg)
 
 PNGS = $(SVG:%.svg=%-small.png) $(SVG:%.svg=%.png)  $(SVG:%.svg=%-large.png)	\
 	publican-clusterlabs/en-US/images/image_left.png			\
 	publican-clusterlabs/en-US/images/image_right.png			\
 	publican-clusterlabs/en-US/images/h1-bg.png
 
 graphics: $(PNGS)
 
 %.png: %.svg
 	inkscape --file=$< --export-dpi=90 -C --export-png=$@
 
 %-small.png: %.svg
 	inkscape --file=$< --export-dpi=45 -C --export-png=$@
 
 %-large.png: %.svg
 	inkscape --file=$< --export-dpi=180 -C --export-png=$@
 
 XML_FILES := $(wildcard *.xml)
 PNG_FILES := $(wildcard images/*.png)
 
 if BUILD_ASCIIDOC
 generated_docs	+= $(ascii:%.txt=%.html)
 endif
 
 if BUILD_DOCBOOK
 publican_docs	+= $(docbook)
 generated_docs	+= index.html
 endif
 
 EXTRA_DIST	= $(man_MANS) $(docbook:%=%.xml) 
 
 index.html:  $(docbook_txt)
 	echo "Building documentation index"
 	echo "<html><body><p>The following <a href=\"http://www.clusterlabs.org/wiki/Pacemaker\">Pacemaker</a> documentation was generated on `date` from version: $(BUILD_VERSION)</p>" > index.html	
 	echo "<ol>" >> index.html
 	for doc in $(generated_docs); do 					\
 		echo "<li><a href=\"$$doc\">$$doc</a></li>" >> index.html; 	\
 	done
 if BUILD_DOCBOOK
 	for book in $(docbook); do 					\
 	    for lang in `ls -1 $$book/publish`; do 			\
 	      echo "<li>$$book ($$lang)<ul>" >> index.html; 	\
 	      find $$book/publish/$$lang -name "*.pdf" -exec echo -n "<li><a href=\"{}\">" \; -exec basename {} \; -exec echo "</a></li>" \; | sed s:$$book/publish/:: >> index.html ;		\
 	      find $$book/publish/$$lang -name "*.txt" -exec echo -n "<li><a href=\"{}\">" \; -exec basename {} \; -exec echo "</a></li>" \; | sed s:$$book/publish/:: >> index.html ;		\
 	      find $$book/publish/$$lang -name html -exec echo "<li><a href=\"{}/$$book/index.html\">$$book HTML</a></li>" \; | sed s:$$book/publish/:: >> index.html ;		 		\
 	      find $$book/publish/$$lang -name html-single -exec echo "<li><a href=\"{}/$$book/index.html\">$$book HTML (single page)</a></li>" \; | sed s:$$book/publish/:: >> index.html ;	\
 	      echo "</ul></li>" >> index.html; 				\
 	    done;							\
 	done
 endif
 	echo "</ol>" >> index.html	
 	echo "<p>You can find <a href=\"http://www.clusterlabs.org/wiki/Documentation\">additional documentation</a> and details about the Pacemaker project at <a href=\"http://www.clusterlabs.org\">http://www.clusterlabs.org</a></p>" >> index.html	
 	echo "</body></html>" >> index.html	
 
 %.html: %.txt
 	$(ASCIIDOC) --unsafe --backend=xhtml11 $<
 
 %.txt: %/en-US/*.xml
+	@echo Building $*
 	cd $* && $(PUBLICAN) build --publish --langs=all --formats=pdf,html,html-single,txt
 	touch $@
 
 if BUILD_DOCBOOK
 docbook_txt = $(docbook:%=%.txt)
 
 all-local: $(docbook_txt) */publican.cfg
 
 #install-data-local: all-local
 install-data-local: all-local
 	for book in $(docbook); do 							\
 	    filelist=`find $$book/publish/* -print`;					\
 	    for f in $$filelist; do							\
 		p=`echo $$f | sed s:publish/:: | sed s:Pacemaker/::`;			\
 		if [ -d $$f ]; then							\
 			$(INSTALL) -d 775 $(DESTDIR)$(docdir)/$$p;			\
 		else									\
 			$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$p;			\
 		fi									\
 	    done;									\
 	done
 endif
 
 brand:
 	find publican-clusterlabs -name "*.noarch.rpm" -exec rm -f \{\} \;
 	cd publican-clusterlabs && $(PUBLICAN) package --binary
 	find publican-clusterlabs -name "*.noarch.rpm" -exec sudo rpm -Uvh --force \{\} \;
 
 push:   all-local $(generated_docs)
 	echo Uploading current documentation set to clusterlabs.org
 	rsync -rtz --progress $(generated_docs) $(ascii) root@oss.clusterlabs.org:/var/www/html/doc/
 if BUILD_DOCBOOK
 	for book in $(docbook); do 									\
 		echo Uploading $$book...;								\
 		echo "Generated on `date` from version: $(BUILD_VERSION)" > $$book/publish/build-$(PACKAGE_SERIES).txt;	\
 		rsync -rtz --progress $$book/publish/* root@oss.clusterlabs.org:/var/www/html/doc/;	\
 	done
 endif
 
 clean-local:
 	-rm -rf $(generated_docs) $(docbook_txt)
 	for book in $(docbook); do rm -rf $$book/tmp $$book/publish; done